Git stash: Scenarios and Operations for Temporarily Saving Uncommitted Code
Git stash is used to temporarily save uncommitted work progress, solving code management issues when switching branches or handling other tasks. Common scenarios include when an urgent repair for an online bug is needed during development, or when temporarily dealing with a simple task, allowing the current modifications to be safely saved. Core operations: Use `git stash save "message"` to save uncommitted changes; use `git stash list` to view the list of saved stashes; use `git stash pop` (restore and delete) or `git stash apply` (restore and keep) to restore the most recent stash; use `git stash drop` to delete a specific stash, and `git stash clear` to delete all stashes. The `-u` parameter can save untracked files. Note: Stash does not save untracked files; for long-term work progress, it is recommended to use `git commit` to avoid relying on stash. Mastering these operations allows flexible management of the development process and ensures code safety.
Read MoreSwitching Branches in Git Without Losing Code: Using Stash to Temporarily Store Uncommitted Changes
### Guide to Using Git Stash for Temporarily Stashing Changes When developing with Git, uncommitted modifications will be overwritten if you switch branches. Git Stash is a temporary storage tool that can save uncommitted changes in both the working directory and staging area, restoring a clean working directory for safe branch switching. **Core Operations**: 1. **Stash Changes**: Run `git stash` to temporarily save all uncommitted changes and clear the working directory (outputs a WIP record like "Saved working directory..."). 2. **Switch Branches**: Use `git checkout <target-branch>` to safely switch branches and focus on tasks. 3. **Restore Changes**: After completing work, switch back to the original branch and use `git stash pop` to restore stashed changes (removes the record); use `git stash apply` if you need to keep the record. **Additional Commands**: - `git stash list` to view all stashed records; - `git stash drop stash@{n}` to delete a specific record (where `n` is the index). **Conflict Handling**: If conflicts occur during restoration, manually resolve conflicted files (marked with `<<<<<<< HEAD` at the start), then execute `git add <conflict-file>` (Note: The original text may have been truncated here; the command should be completed as `git add <conflict-file>` followed by commit/resolution steps).
Read MoreGit stash Stashing Function: Temporarily Save Uncommitted Code
Git stash is used to temporarily stash uncommitted changes in the working directory and staging area, avoiding conflicts when switching branches or pulling code. It saves the modifications and restores the working directory to the state of the most recent commit, without retaining branch information. Core commands: `git stash` to stash changes, `git stash apply` to restore the most recent stash (without deletion), `git stash pop` to restore and delete (recommended), and `git stash list` to view stashes. A practical scenario is urgent bug fixing: stash changes → switch branches to fix → restore stash. Note: Stash is temporary, and conflicts may occur during restoration. The difference between `pop` and `apply` is whether the stash record is deleted. Stash is not a branch. Master the core commands, clean up stashes after use, and keep the working directory tidy.
Read More